Refactor Types (and use latest barretenberg) #305

suyash67 · 2023-04-19T18:00:07Z

Description

We no longer have stdlib/types/types.hpp in barretenberg. Instead, we intend to declare typedefs locally as and when necessary. This PR updates bb submodule to incorporate latest changes and then ensures that we use local typedefs instead of global ones. This would allow us to run different parts of circuits infrastructure with different composers.

Note that we point to aztec3-temporary branch on barretenberg (based off the latest master). This is because we still need large number of generators while using Ultraplonk in aztec3.

tldr:

Updates bberg submodule to point to latest changes (points to aztec3-temporary branch)
All of the circuits code now have locally defined Composer = plonk::UltraComposer, so we're using Ultraplonk in a3.
All the hard-coded state constants have been changed as we now use pedersen stuff from ultraplonk for merkle hashing
Fixed the issue of rollup tests crashing locally

Resolves: AztecProtocol/aztec3-circuits#191
Resolves AztecProtocol/aztec3-circuits#187

Checklist:

I have reviewed my diff in github, line by line.
Every change is related to the PR description.
I have linked this pull request to the issue(s) that it resolves.
There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
The branch has been merged or rebased against the head of its merge target.
I'm happy for the PR to be merged at the reviewer's next convenience.

ludamad · 2023-04-19T22:38:26Z

Looks like the memory of the WASM needs to be bumped

suyash67 · 2023-04-20T09:39:16Z

Looks like the memory of the WASM needs to be bumped

Yeah I guess that is because I am restarting to use ultraplonk?

ludamad · 2023-04-20T12:38:39Z

Probably, we see this when switching provers, I guess they have a bunch of static data or something?

…er fixes. remove any `stdlib::types`. update bb to point to temp aztec3. remove `USE_TURBO`. Include array package. Bump wasm memory to use 30 initial pages. fix abi TS tests. Fix circuit js test. remove stdlib/types from init in public kernel circuit. update abi snapshots. update bb. Increase merkle tree test timeout by 2 sec. Compute empty subtree roots in runtime (doing so in compile time creates issue of empty runtime generator tables) fix. Use lookup-pedersen for hashing nullifier leaves. Fix a merkle tree test. Bump up merkle tree test timeout by 1 more sec. TRY large timeout for merkle tests. Change composer in `mockedKeys.json` to ultra. chore: updated contract json keys increase e2e test timeouts. e2e timeout increase (again). revert test filter in merkle tree ts.

[SQUASHED] Update bb, remove stdlib/types/types.hpp and couple of other fixes. remove any `stdlib::types`. update bb to point to temp aztec3. remove `USE_TURBO`. Include array package. Bump wasm memory to use 30 initial pages. fix abi TS tests. Fix circuit js test. remove stdlib/types from init in public kernel circuit. update abi snapshots. update bb. Increase merkle tree test timeout by 2 sec. Compute empty subtree roots in runtime (doing so in compile time creates issue of empty runtime generator tables) fix. Use lookup-pedersen for hashing nullifier leaves. Fix a merkle tree test. Bump up merkle tree test timeout by 1 more sec. TRY large timeout for merkle tests. Change composer in `mockedKeys.json` to ultra. chore: updated contract json keys increase e2e test timeouts. e2e timeout increase (again). revert test filter in merkle tree ts. Fix build post rebase. Use lookup pedersen hash in native types for merkle hashing. update empty L2 block hash hard-coded value. Fix pk native circuit wasm. remove old code. remove comments. remove more logs.

* Split Pedersen Hash & Commitment Gadgets (#95) * [SQUASHED] Pedersen refactor into hash and commitment. Use lookup pedersen for merkle tree, fixed-base pedersen for commitments. --------- Co-authored-by: Suyash Bagad <[email protected]> Port `copy_as_new_witness`. Port `must_imply`. `operator++`. Port changes from `common`. Port `ecc/groups`. * [CPM] add missing dependencies to libbarretenberg.a (#154) --------- * Increase Pedersen Generator indices and subindices. (#169) * Remove a3 specific types. (#252) * Address Luke's Comments on `aztec3 -> master` (#263) * Add must_imply tests. * Added a test for `field_t::copy_as_new_witness` * add test for `conditional_assign` * Added `infinity` test. * Add `add_affine_test`. * Tests for Array Object in `stdlib` (#262) * basic array tests. * Add `composer_type` while hashing/compressing a vkey. * Add `contains_recursive_proof` to Recursive VK (#268) * feat: debug utility for serialization (#290) * feat: enable asan config * `array_push` for Generic Type (#291) * Add Indexed Merkle Tree (#281) * remove ts (consulted with Adam and we're good to go). (#292) * Add cout for verification_key struct (#295) * compute tree (#298) * [SQUASHED] fixing `push_array_to_array` method. (#304) * feat(memory_tree|a3): add sibling path calculations (#301) * feat(memory_tree): frontier paths * fix array and resolve merge conflicts (#305) * Mc/hash vk (#306) * Increase number of sub-generators to 128. * Build a3crypto.wasm (#311) * More Tests on A3 `stdlib` methods (#316) * test: more vk tests to compare circuit/native/vk_data (#310) * Mc/hash vk (#306) * inc num_generators_per_hash_index to 128. (#309) * fix. (#318) * Added test for `compute_tree_native`. (#319) * Install instructions for apt on ubuntu (#312) * Fix address compilation. (#329) --------- Co-authored-by: David Banks <[email protected]> Co-authored-by: Michael Connor <[email protected]> Co-authored-by: dbanks12 <[email protected]> Co-authored-by: Santiago Palladino <[email protected]> Co-authored-by: ludamad <[email protected]> Co-authored-by: Maddiaa <[email protected]> Co-authored-by: Santiago Palladino <[email protected]> Co-authored-by: ludamad <[email protected]> Co-authored-by: cheethas <[email protected]>

suyash67 force-pushed the sb/refactor-types branch from 2a5e1b1 to 380493e Compare April 19, 2023 18:08

dbanks12 mentioned this pull request Apr 21, 2023

fix: enforce correct length of hashConstructor args #321

Merged

6 tasks

suyash67 force-pushed the sb/refactor-types branch from 978cd43 to ec87f4f Compare April 21, 2023 14:13

suyash67 mentioned this pull request Apr 23, 2023

Fix Rollup Tests (for Local testing) #298

Closed

6 tasks

suyash67 marked this pull request as ready for review April 25, 2023 13:38

iAmMichaelConnor mentioned this pull request Apr 25, 2023

Generator ASSERT should be failing for wasm but is ignored #307

Closed

suyash67 force-pushed the sb/refactor-types branch from 5692c97 to a695ff7 Compare April 25, 2023 18:12

suyash67 added 7 commits April 25, 2023 18:25

Fix build post rebase.

2f81f6b

Use lookup pedersen hash in native types for merkle hashing.

d9f250b

update empty L2 block hash hard-coded value.

fd1de3a

Fix pk native circuit wasm.

135381c

remove old code.

237bc91

remove comments.

61359a6

remove more logs.

49de87a

suyash67 merged commit 9730b9b into master Apr 26, 2023

suyash67 deleted the sb/refactor-types branch April 26, 2023 12:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor Types (and use latest barretenberg) #305

Refactor Types (and use latest barretenberg) #305

suyash67 commented Apr 19, 2023 •

edited

Loading

ludamad commented Apr 19, 2023

suyash67 commented Apr 20, 2023 •

edited

Loading

ludamad commented Apr 20, 2023

Refactor Types (and use latest barretenberg) #305

Refactor Types (and use latest barretenberg) #305

Conversation

suyash67 commented Apr 19, 2023 • edited Loading

Description

Checklist:

ludamad commented Apr 19, 2023

suyash67 commented Apr 20, 2023 • edited Loading

ludamad commented Apr 20, 2023

suyash67 commented Apr 19, 2023 •

edited

Loading

suyash67 commented Apr 20, 2023 •

edited

Loading